Use OSGi Annotations to produce felix.log manifest and clean up. #359

wilx · 2024-12-11T23:02:30Z

While I was working on reviving felix.logback I was going through the code and I wondered if it could be modernized a little bit. This is the result. I am not sure if it is useful for the project as I have no idea what minimum platform and JVM version it targets.

stbischof · 2024-12-12T07:51:51Z

Just to validate.
Could you show Manifest before and after here as comments.

Updating parent pom seems okay.
Annotations are made for that. So also good.

Need to look deeper but think this is fine.

log/pom.xml

wilx · 2024-12-12T08:18:21Z

Could you show Manifest before and after here as comments.

It is slightly different. I will provide the comparison later today.

laeubi · 2024-12-12T08:27:16Z

While I was working on reviving felix.logback I was going through the code and I wondered if it could be modernized a little bit.

There is also now some github validation so you should enable that for your module as well, just duplicate the line with your module.

felix-dev/.github/workflows/maven.yml

Line 30 in 65ac388

- name: Felix SCR

log/src/main/java/org/apache/felix/log/Activator.java

rotty3000

Just a few nits.

Besides that, thank you @wilx for breathing some life into this bundle. :)

wilx · 2024-12-13T10:45:08Z

I have pushed some changes.

This is the difference between the 1.3.0 version and the branch snapshot version in MANIFEST.MF after those changes. I have made manually concatenated the MANIFEST.MF lines for easier comparison. There are differences in uses for the Provide-Capability.

--- scratch_1.MF        2024-12-13 11:35:27.643249474 +0100
+++ scratch_2.MF        2024-12-13 11:35:55.859447078 +0100
@@ -1,7 +1,5 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1684133251156
-Build-Jdk: 11.0.19
-Built-By: jbonofre
+Build-Jdk-Spec: 17
 Bundle-Activator: org.apache.felix.log.Activator
 Bundle-Description: A simple implementation of the OSGi R8 Log service
  .
@@ -11,8 +9,8 @@
 Bundle-Name: Apache Felix Log Service
 Bundle-SymbolicName: org.apache.felix.log
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.3.0
-Created-By: Apache Maven Bundle Plugin
+Bundle-Version: 1.3.1.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin 5.1.9
 Export-Package: org.osgi.service.log;version="1.5";uses:="org.osgi.fra
  mework",org.osgi.service.log.admin;version="1.0";uses:="org.osgi.serv
  ice.log"
@@ -20,8 +18,9 @@
  k.wiring;version="[1.2,2)",org.osgi.service.log;version="[1.5,1.6)",o
  rg.osgi.service.log.admin;version="[1.0,1.1)",org.osgi.util.tracker;v
  ersion="[1.5,2)"
-Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",
- osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",
- osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log",
+ osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin",
+ osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"
 Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)";effective:=active,osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
-Tool: Bnd-3.5.0.201709291849
+Tool: Bnd-6.3.1.202206071316
+

log/pom.xml

rotty3000

LGMT (though I do wish we would use provided with the "build time" dependencies.)

stbischof · 2024-12-17T18:13:58Z

@laeubi could you look on the ci?

@wilx i think just run pr against master is enough

Would be also greate to have a setup that runs also the original tck.

laeubi

I also think the branch spec should only be master at the moment, the rest of the CI change looks fine

.github/workflows/maven.yml

stbischof · 2025-01-06T22:58:59Z

@wilx could you resolve the merge conflict on .github/workflows/maven.yml?

then i would like to merge

wilx · 2025-01-06T23:18:42Z

@wilx could you resolve the merge conflict on .github/workflows/maven.yml?

then i would like to merge

I have rebased the branch on master.

log/pom.xml

stbischof · 2025-03-17T11:08:23Z

<dependency> 
   <groupId>org.osgi</groupId> 
   <artifactId>osgi.annotation</artifactId> 
   <version>8.1.0</version> 
   <scope>provided</scope> 
 </dependency>

Could you please use the elementar API dependencies and not the aggregator.

wilx · 2025-03-17T18:38:06Z

@stbischof Done.

log/src/main/java/org/apache/felix/log/FormatterLoggerImpl.java

stbischof · 2025-03-17T18:44:40Z

And please copy Manifest before and after your changes. This helps us to see the differences .

Bit we are on a good way. Thx

wilx · 2025-03-17T18:54:39Z

The diff with manually concatenated lines for easier comparison:

`--> diff -upd ./org.apache.felix.log-1.3.0/META-INF/MANIFEST.MF ./org.apache.felix.log-1.3.1-SNAPSHOT/META-INF/MANIFEST.MF
--- ./org.apache.felix.log-1.3.0/META-INF/MANIFEST.MF	2025-03-17 19:53:14.737422780 +0100
+++ ./org.apache.felix.log-1.3.1-SNAPSHOT/META-INF/MANIFEST.MF	2025-03-17 19:52:52.601235604 +0100
@@ -1,7 +1,5 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1684133251156
-Build-Jdk: 11.0.19
-Built-By: jbonofre
+Build-Jdk-Spec: 17
 Bundle-Activator: org.apache.felix.log.Activator
 Bundle-Description: A simple implementation of the OSGi R8 Log service
  .
@@ -11,10 +9,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Apache Felix Log Service
 Bundle-SymbolicName: org.apache.felix.log
 Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.3.0
-Created-By: Apache Maven Bundle Plugin
+Bundle-Version: 1.3.1.SNAPSHOT
+Created-By: Apache Maven Bundle Plugin 6.0.0
 Export-Package: org.osgi.service.log;version="1.5";uses:="org.osgi.framework",org.osgi.service.log.admin;version="1.0";uses:="org.osgi.service.log"
 Import-Package: org.osgi.framework;version="[1.8,2)",org.osgi.framework.wiring;version="[1.2,2)",org.osgi.service.log;version="[1.5,1.6)",org.osgi.service.log.admin;version="[1.0,1.1)",org.osgi.util.tracker;version="[1.5,2)"
-Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"
 Require-Capability: osgi.service;filter:="(objectClass=org.osgi.service.cm.ConfigurationAdmin)";effective:=active,osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
-Tool: Bnd-3.5.0.201709291849
+Tool: Bnd-7.0.0.202310060912
+

stbischof · 2025-03-17T19:13:14Z

@laeubi final opinion?
@wilx did you investigated the diff in

-Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.osgi.service.log,org.osgi.service.log.admin"
+Provide-Capability: osgi.service;objectClass:List<String>="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log",osgi.service;objectClass:List<String>="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin",osgi.service;objectClass:List<String>="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"

wilx · 2025-03-17T21:44:42Z

osgi.service;objectClass:List="org.osgi.service.log.LogReaderService";uses:="org.apache.felix.log,org.osgi.service.log"

This is different because what I declared, which is IMHO more accurate:

@Capability(
        namespace = ServiceNamespace.SERVICE_NAMESPACE,
        attribute = { "objectClass:List<String>=\"org.osgi.service.log.LogReaderService\"" },
        uses = { LogReaderServiceImpl.class, LogReaderService.class }
)
final class LogReaderServiceImpl implements LogReaderService

osgi.service;objectClass:List="org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory";uses:="org.apache.felix.log,org.osgi.service.log,org.osgi.service.log.admin"

@Capability(
        namespace = ServiceNamespace.SERVICE_NAMESPACE,
        attribute = { "objectClass:List<String>=\"org.osgi.service.log.LogService,org.osgi.service.log.LoggerFactory\"" },
        uses = { LogServiceImpl.class, LogService.class, LoggerFactory.class, LoggerAdmin.class }
)
final class LogServiceImpl implements LogService

objectClass:List="org.osgi.service.log.admin.LoggerAdmin";uses:="org.apache.felix.log,org.osgi.service.log.admin"

@Capability(
        namespace = ServiceNamespace.SERVICE_NAMESPACE,
        attribute = { "objectClass:List<String>=\"org.osgi.service.log.admin.LoggerAdmin\"" },
        uses = { LoggerAdminImpl.class, LoggerAdmin.class }
)
public class LoggerAdminImpl implements LoggerAdmin {

log/pom.xml

stbischof · 2025-03-19T11:45:37Z

Thank you!

wilx force-pushed the tiny-fixes2 branch from ca77f61 to a4e386f Compare December 12, 2024 05:59

stbischof changed the title ~~Use BND to produce felix.log manifest and clean up.~~ Use OSGi Annotations to produce felix.log manifest and clean up. Dec 12, 2024

stbischof reviewed Dec 12, 2024

View reviewed changes

log/pom.xml Outdated Show resolved Hide resolved

rotty3000 reviewed Dec 12, 2024

View reviewed changes

log/src/main/java/org/apache/felix/log/Activator.java Outdated Show resolved Hide resolved

rotty3000 requested changes Dec 12, 2024

View reviewed changes

wilx force-pushed the tiny-fixes2 branch from a4e386f to 15f00bb Compare December 13, 2024 08:08

wilx requested a review from rotty3000 December 13, 2024 08:19

wilx force-pushed the tiny-fixes2 branch 5 times, most recently from c7a0dae to 3362c1f Compare December 13, 2024 10:38

rotty3000 reviewed Dec 13, 2024

View reviewed changes

log/pom.xml Show resolved Hide resolved

rotty3000 approved these changes Dec 13, 2024

View reviewed changes

wilx force-pushed the tiny-fixes2 branch from 3362c1f to 0000f17 Compare December 13, 2024 19:59

wilx mentioned this pull request Dec 14, 2024

Implement 101.8.4 Log Events #362

Open

laeubi reviewed Dec 18, 2024

View reviewed changes

.github/workflows/maven.yml Outdated Show resolved Hide resolved

wilx force-pushed the tiny-fixes2 branch from b778186 to 8553d60 Compare December 18, 2024 17:10

wilx force-pushed the tiny-fixes2 branch from 8553d60 to 647a502 Compare January 6, 2025 23:18

paulrutter reviewed Jan 7, 2025

View reviewed changes

log/pom.xml Outdated Show resolved Hide resolved

Update org.apache:apache to version 33.

7ea9a14

wilx force-pushed the tiny-fixes2 branch from a6b4577 to a8b8849 Compare March 16, 2025 09:09

wilx force-pushed the tiny-fixes2 branch from a8b8849 to 2c4f93b Compare March 17, 2025 18:37

stbischof requested changes Mar 17, 2025

View reviewed changes

log/src/main/java/org/apache/felix/log/FormatterLoggerImpl.java Outdated Show resolved Hide resolved

laeubi reviewed Mar 18, 2025

View reviewed changes

log/pom.xml Show resolved Hide resolved

wilx added 6 commits March 18, 2025 18:41

felix.log: Use OSGi annotations to produce OSGi MANIFEST.MF entries.

ba20f16

felix.log: Clean up.

40e425e

felix.log: Enable GitHub CI Build.

954179f

GitHub CI Build: Use Maven 3.9.9.

b49bcb1

felix.scr: Fix printing of array of primitive types.

adcb5bc

felix.log: Use Maven Bundle plugin version 6.0.0.

605b7be

wilx force-pushed the tiny-fixes2 branch from 2c4f93b to 605b7be Compare March 18, 2025 17:48

stbischof approved these changes Mar 19, 2025

View reviewed changes

stbischof merged commit 2d71c5b into apache:master Mar 19, 2025
1 check passed

Use OSGi Annotations to produce felix.log manifest and clean up. #359

Use OSGi Annotations to produce felix.log manifest and clean up. #359

Uh oh!

Conversation

wilx commented Dec 11, 2024

Uh oh!

stbischof commented Dec 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

wilx commented Dec 12, 2024

Uh oh!

laeubi commented Dec 12, 2024

Uh oh!

Uh oh!

rotty3000 left a comment

Choose a reason for hiding this comment

Uh oh!

wilx commented Dec 13, 2024

Uh oh!

Uh oh!

rotty3000 left a comment

Choose a reason for hiding this comment

Uh oh!

stbischof commented Dec 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

laeubi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

stbischof commented Jan 6, 2025

Uh oh!

wilx commented Jan 6, 2025

Uh oh!

Uh oh!

stbischof commented Mar 17, 2025

Uh oh!

wilx commented Mar 17, 2025

Uh oh!

Uh oh!

stbischof commented Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wilx commented Mar 17, 2025

Uh oh!

stbischof commented Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wilx commented Mar 17, 2025

Uh oh!

Uh oh!

stbischof commented Mar 19, 2025

Uh oh!

Uh oh!

Uh oh!

stbischof commented Dec 12, 2024 •

edited

Loading

stbischof commented Dec 17, 2024 •

edited

Loading

stbischof commented Mar 17, 2025 •

edited

Loading

stbischof commented Mar 17, 2025 •

edited

Loading